[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 14ab05: Add Dunning into compta repor
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 14ab05: Add Dunning into compta report |
Date: |
Thu, 18 Sep 2014 08:48:42 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 14ab058f34147859f1935ac51ee06bd28f680f98
https://github.com/Dolibarr/dolibarr/commit/14ab058f34147859f1935ac51ee06bd28f680f98
Author: Florian HENRY <address@hidden>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/compta/dons/class/don.class.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/langs/en_US/donations.lang
M htdocs/langs/fr_FR/donations.lang
Log Message:
-----------
Add Dunning into compta report
Commit: bb612d24db445a0839ae2dd380b57fd2337256de
https://github.com/Dolibarr/dolibarr/commit/bb612d24db445a0839ae2dd380b57fd2337256de
Author: Florian HENRY <address@hidden>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M .travis.yml
M COPYRIGHT
M ChangeLog
M build/debian/README.howto
M build/debian/control
M build/debian/copyright
M build/debian/dolibarr.postinst
M build/debian/get-orig-source.sh
M build/exe/doliwamp/doliwamp.iss
R build/makepack-dolibarrlang.pl
M dev/codesniffer/ruleset.xml
A dev/optimize_images.sh
M dev/skeletons/build_class_from_table.php
M dev/skeletons/skeleton_class.class.php
M dev/skeletons/skeleton_page.php
M htdocs/.gitignore
A htdocs/accountancy/admin/account.php
A htdocs/accountancy/admin/card.php
A htdocs/accountancy/admin/export.php
A htdocs/accountancy/admin/fiscalyear.php
A htdocs/accountancy/admin/fiscalyear_card.php
A htdocs/accountancy/admin/fiscalyear_info.php
A htdocs/accountancy/admin/importaccounts.php
A htdocs/accountancy/admin/index.html
A htdocs/accountancy/admin/index.php
A htdocs/accountancy/admin/journaux.php
A htdocs/accountancy/admin/productaccount.php
A htdocs/accountancy/bookkeeping/balancebymonth.php
A htdocs/accountancy/bookkeeping/card.php
A htdocs/accountancy/bookkeeping/index.html
A htdocs/accountancy/bookkeeping/list.php
A htdocs/accountancy/bookkeeping/listbyyear.php
R htdocs/accountancy/class/accountancyaccount.class.php
M htdocs/accountancy/class/accountancysystem.class.php
A htdocs/accountancy/class/accountingaccount.class.php
A htdocs/accountancy/class/bookkeeping.class.php
A htdocs/accountancy/class/html.formventilation.class.php
A htdocs/accountancy/customer/card.php
A htdocs/accountancy/customer/index.html
A htdocs/accountancy/customer/index.php
A htdocs/accountancy/customer/lines.php
A htdocs/accountancy/customer/list.php
A htdocs/accountancy/journal/bankjournal.php
A htdocs/accountancy/journal/cashjournal.php
A htdocs/accountancy/journal/index.html
A htdocs/accountancy/journal/index.php
A htdocs/accountancy/journal/purchasesjournal.php
A htdocs/accountancy/journal/sellsjournal.php
A htdocs/accountancy/supplier/card.php
A htdocs/accountancy/supplier/index.html
A htdocs/accountancy/supplier/index.php
A htdocs/accountancy/supplier/lines.php
A htdocs/accountancy/supplier/list.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/cartes/carte.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/fiche.php
M htdocs/adherents/stats/geo.php
R htdocs/admin/accounting.php
M htdocs/admin/agenda_extsites.php
M htdocs/admin/company.php
M htdocs/admin/dict.php
M htdocs/admin/facture.php
R htdocs/admin/fiscalyear.php
R htdocs/admin/fiscalyear_card.php
R htdocs/admin/fiscalyear_info.php
M htdocs/admin/limits.php
M htdocs/admin/menus/edit.php
A htdocs/admin/salaries.php
M htdocs/admin/security_other.php
M htdocs/admin/system/dolibarr.php
M htdocs/admin/tools/update.php
M htdocs/cashdesk/affContenu.php
M htdocs/cashdesk/facturation.php
M htdocs/cashdesk/index.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/class/actioncomm.class.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/action/peruser.php
M htdocs/comm/action/rapport/index.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
M htdocs/commande/info.php
M htdocs/commande/liste.php
M htdocs/commande/orderstoinvoice.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/bankid_fr.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/fiche.php
M htdocs/compta/bank/index.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/deplacement/fiche.php
M htdocs/compta/deplacement/list.php
M htdocs/compta/deplacement/stats/index.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/impayees.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
M htdocs/compta/paiement.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/liste.php
M htdocs/compta/prelevement/rejets.php
M htdocs/compta/recap-compta.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/salaries/fiche.php
M htdocs/compta/salaries/index.php
M htdocs/compta/tva/fiche.php
M htdocs/contact/canvas/actions_contactcard_common.class.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/info.php
M htdocs/contact/list.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/fiche.php
M htdocs/contrat/info.php
M htdocs/core/ajax/ajaxdirpreview.php
M htdocs/core/ajax/ajaxdirtree.php
M htdocs/core/ajax/ziptown.php
M htdocs/core/boxes/box_contacts.php
M htdocs/core/boxes/box_project.php
M htdocs/core/boxes/box_task.php
M htdocs/core/boxes/modules_boxes.php
A htdocs/core/class/ccountry.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/commonobject.class.php
R htdocs/core/class/cpays.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/fiscalyear.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/class/html.formfile.class.php
A htdocs/core/class/html.formintervention.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/html.formsocialcontrib.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/db/mssql.class.php
M htdocs/core/db/mysql.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/js/lib_head.js
A htdocs/core/lib/accounting.lib.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/bank.lib.php
M htdocs/core/lib/categories.lib.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/contact.lib.php
M htdocs/core/lib/contract.lib.php
M htdocs/core/lib/date.lib.php
M htdocs/core/lib/ecm.lib.php
M htdocs/core/lib/emailing.lib.php
M htdocs/core/lib/fichinter.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/fiscalyear.lib.php
M htdocs/core/lib/fourn.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/memory.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/prelevement.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/propal.lib.php
M htdocs/core/lib/sendings.lib.php
M htdocs/core/lib/stock.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/lib/trip.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/menus/standard/empty.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/action/rapport.pdf.php
M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/commande/modules_commande.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/contract/modules_contract.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/expedition/modules_expedition.php
M htdocs/core/modules/export/export_excel.modules.php
M htdocs/core/modules/export/export_excel2007.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/facture/modules_facture.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/fichinter/modules_fichinter.php
M htdocs/core/modules/livraison/modules_livraison.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.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/fraise.modules.php
M htdocs/core/modules/mailings/framboise.modules.php
M htdocs/core/modules/mailings/pomme.modules.php
M htdocs/core/modules/modAccounting.class.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/core/modules/modCommande.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/modProduct.class.php
M htdocs/core/modules/modProductBatch.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modPropale.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modStock.class.php
M htdocs/core/modules/project/modules_project.php
M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
M htdocs/core/modules/project/task/modules_task.php
M htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/propale/mod_propale_marbre.php
M htdocs/core/modules/propale/mod_propale_saphir.php
M htdocs/core/modules/propale/modules_propale.php
M htdocs/core/modules/rapport/pdf_paiement.class.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/core/modules/societe/modules_societe.class.php
M htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/tpl/document_actions_pre_headers.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/notes.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/fiche.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/exports/export.php
A htdocs/fichinter/admin/fichinterdet_extrafields.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/fiche.php
M htdocs/fichinter/list.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/fiche.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/paiement/fiche.php
M htdocs/holiday/index.php
M htdocs/includes/ckeditor/contents.css
M htdocs/includes/phpexcel/PHPExcel.php
M htdocs/includes/phpexcel/PHPExcel/Autoloader.php
M htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/APC.php
M htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/CacheBase.php
M htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/DiscISAM.php
M htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/ICache.php
A htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Igbinary.php
M htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Memcache.php
M htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Memory.php
M htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
M htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
M htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/PHPTemp.php
A htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/SQLite.php
A htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/SQLite3.php
M htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Wincache.php
M htdocs/includes/phpexcel/PHPExcel/CachedObjectStorageFactory.php
R htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/.noencode
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop
Conflicts:
ChangeLog
htdocs/compta/resultat/clientfourn.php
htdocs/compta/resultat/index.php
Commit: 32c777a78bc1a639c1ebef8f0fcc9e41afe348c7
https://github.com/Dolibarr/dolibarr/commit/32c777a78bc1a639c1ebef8f0fcc9e41afe348c7
Author: Florian HENRY <address@hidden>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
Log Message:
-----------
Fix bad merge
Commit: fc65421b2eda7dea72004ae0d87d0ed2f4f1c99f
https://github.com/Dolibarr/dolibarr/commit/fc65421b2eda7dea72004ae0d87d0ed2f4f1c99f
Author: Florian HENRY <address@hidden>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M htdocs/compta/resultat/clientfourn.php
Log Message:
-----------
bad merge
Commit: 15d680ea4b64c035c9853a8560aea1c4abaa6bc4
https://github.com/Dolibarr/dolibarr/commit/15d680ea4b64c035c9853a8560aea1c4abaa6bc4
Author: Florian HENRY <address@hidden>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M htdocs/compta/resultat/clientfourn.php
Log Message:
-----------
bad mege
Commit: 2b69358c9ca874518de9ea55d7dbbe8840d5ff06
https://github.com/Dolibarr/dolibarr/commit/2b69358c9ca874518de9ea55d7dbbe8840d5ff06
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/compta/dons/class/don.class.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/langs/en_US/donations.lang
M htdocs/langs/fr_FR/donations.lang
Log Message:
-----------
Merge pull request #1896 from FHenry/develop
Add Dunning into accountancy report
Compare:
https://github.com/Dolibarr/dolibarr/compare/fd890c0b8175...2b69358c9ca8
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 14ab05: Add Dunning into compta report,
Laurent Destailleur <=