[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 6c62bf: Merge develop
|
From: |
Herve Prot |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 6c62bf: Merge develop |
|
Date: |
Sat, 20 Aug 2011 01:21:35 -0700 |
Branch: refs/heads/symeos-dev
Home: https://github.com/Dolibarr/dolibarr
Commit: 6c62bfd75ba1b67461f75d19df671e93a547cce1
https://github.com/Dolibarr/dolibarr/commit/6c62bfd75ba1b67461f75d19df671e93a547cce1
Author: Herve Prot <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Changed paths:
M .gitmodules
M COPYRIGHT
M ChangeLog
M build/deb/changelog
M build/deb/control.debian
M build/deb/control.debianbin
M build/deb/dolibarr.lintian-overrides
M build/deb/install.forced.php.install
M build/deb/postrm
M build/doxygen/dolibarr-doxygen.doxyfile
M build/makepack-dolibarr.pl
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/rpm/install.forced.php.fedora
A build/rpm/install.forced.php.generic
R build/rpm/install.forced.php.install
A build/rpm/install.forced.php.mandriva
A build/rpm/install.forced.php.opensuse
M htdocs/adherents/admin/adherent.php
A htdocs/admin/barcode.php
M htdocs/admin/company.php
M htdocs/admin/facture.php
M htdocs/admin/fckeditor.php
M htdocs/admin/fournisseur.php
M htdocs/admin/ihm.php
M htdocs/admin/perms.php
M htdocs/admin/security.php
M htdocs/admin/security_other.php
M htdocs/admin/sms.php
M htdocs/admin/societe.php
M htdocs/admin/system/index.php
M htdocs/admin/system/modules.php
M htdocs/admin/workflow.php
M htdocs/boxes.php
M htdocs/categories/categorie.php
M htdocs/categories/photos.php
M htdocs/comm/action/rapport/index.php
M htdocs/comm/addpropal.php
M htdocs/comm/propal.php
M htdocs/comm/propal/contact.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/note.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/contact.php
M htdocs/commande/fiche.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/contact.php
M htdocs/compta/facture/impayees.php
M htdocs/compta/prelevement/facturesrejets.php
M htdocs/conf/conf.php.example
M htdocs/contact/fiche.php
M htdocs/contrat/contact.php
M htdocs/contrat/fiche.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/dolgraph.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/interfaces.class.php
M htdocs/core/class/translate.class.php
A htdocs/core/filemanagerdol/browser/default/browser.php
A htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
M htdocs/core/tpl/freeproductline_edit.tpl.php
M htdocs/core/tpl/predefinedproductline_create.tpl.php
M htdocs/core/tpl/predefinedproductline_edit.tpl.php
M htdocs/ecm/index.php
M htdocs/exports/class/export.class.php
M htdocs/fichinter/contact.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/contact.php
M htdocs/fourn/facture/contact.php
M htdocs/ftp/index.php
M htdocs/imports/import.php
M htdocs/includes/artichow/Artichow.cfg.php
M htdocs/includes/artichow/php4/Component.class.php
M htdocs/includes/artichow/php4/Graph.class.php
M htdocs/includes/artichow/php4/MathPlot.class.php
M htdocs/includes/artichow/php4/Plot.class.php
M htdocs/includes/artichow/php5/Component.class.php
M htdocs/includes/artichow/php5/Graph.class.php
M htdocs/includes/artichow/php5/MathPlot.class.php
M htdocs/includes/artichow/php5/Plot.class.php
M htdocs/includes/artichow/php5/inc/Font.class.php
M htdocs/includes/barcode/html.formbarcode.class.php
M htdocs/includes/barcode/php-barcode/php-barcode.php
R htdocs/includes/efc_xfss/README.txt
R htdocs/includes/efc_xfss/crypt_class.php
R htdocs/includes/efc_xfss/efc.class.php
R htdocs/includes/fpdf/fpdfi/README.txt
R htdocs/includes/fpdf/fpdfi/filters/FilterASCII85.php
R htdocs/includes/fpdf/fpdfi/filters/FilterASCII85_FPDI.php
R htdocs/includes/fpdf/fpdfi/filters/FilterLZW.php
R htdocs/includes/fpdf/fpdfi/filters/FilterLZW_FPDI.php
R htdocs/includes/fpdf/fpdfi/fpdf_tpl.php
R htdocs/includes/fpdf/fpdfi/fpdi.php
R htdocs/includes/fpdf/fpdfi/fpdi2tcpdf_bridge.php
R htdocs/includes/fpdf/fpdfi/fpdi_pdf_parser.php
R htdocs/includes/fpdf/fpdfi/fpdi_protection.php
R htdocs/includes/fpdf/fpdfi/pdf_context.php
R htdocs/includes/fpdf/fpdfi/pdf_parser.php
A htdocs/includes/fpdfi/README.txt
A htdocs/includes/fpdfi/filters/FilterASCII85.php
A htdocs/includes/fpdfi/filters/FilterASCII85_FPDI.php
A htdocs/includes/fpdfi/filters/FilterLZW.php
A htdocs/includes/fpdfi/filters/FilterLZW_FPDI.php
A htdocs/includes/fpdfi/fpdf_tpl.php
A htdocs/includes/fpdfi/fpdi.php
A htdocs/includes/fpdfi/fpdi2tcpdf_bridge.php
A htdocs/includes/fpdfi/fpdi_pdf_parser.php
A htdocs/includes/fpdfi/pdf_context.php
A htdocs/includes/fpdfi/pdf_parser.php
M htdocs/includes/modules/action/rapport.pdf.php
R htdocs/includes/modules/barcode/admin/barcode.php
M htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php
M htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
M htdocs/includes/modules/commande/modules_commande.php
M htdocs/includes/modules/commande/pdf_edison.modules.php
M htdocs/includes/modules/commande/pdf_einstein.modules.php
M htdocs/includes/modules/dons/modules_don.php
M htdocs/includes/modules/expedition/methode_expedition.modules.php
M htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
M htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
M htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
M htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/includes/modules/facture/doc/pdf_crabe.modules.php
M htdocs/includes/modules/facture/doc/pdf_oursin.modules.php
M htdocs/includes/modules/facture/modules_facture.php
M htdocs/includes/modules/fichinter/modules_fichinter.php
M htdocs/includes/modules/fichinter/pdf_soleil.modules.php
M htdocs/includes/modules/livraison/modules_livraison.php
M htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
M htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php
M htdocs/includes/modules/member/cards/modules_cards.php
M htdocs/includes/modules/member/cards/pdf_standard.class.php
M htdocs/includes/modules/member/labels/modules_labels.php
M htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
M htdocs/includes/modules/modBarcode.class.php
M htdocs/includes/modules/modSociete.class.php
M htdocs/includes/modules/project/modules_project.php
M htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
M htdocs/includes/modules/propale/modules_propale.php
M htdocs/includes/modules/propale/pdf_propale_azur.modules.php
M htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
M htdocs/includes/modules/rapport/pdf_paiement.class.php
M htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
M htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
M htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/includes/odtphp/odf.php
M htdocs/includes/odtphp/zip/PclZipProxy.php
M htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
M htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php
M htdocs/index.php
M htdocs/install/check.php
M htdocs/install/etape1.php
M htdocs/install/fileconf.php
M htdocs/install/inc.php
M htdocs/install/mysql/migration/2.7.0-2.8.0.sql
M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
M htdocs/install/upgrade2.php
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/errors.lang
M htdocs/langs/ca_ES/products.lang
M htdocs/langs/ca_ES/suppliers.lang
M htdocs/langs/ca_ES/workflow.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/install.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/suppliers.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/install.lang
M htdocs/langs/es_ES/products.lang
M htdocs/langs/es_ES/suppliers.lang
M htdocs/langs/es_ES/workflow.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/langs/fr_FR/install.lang
M htdocs/langs/fr_FR/products.lang
M htdocs/langs/fr_FR/suppliers.lang
M htdocs/lib/agenda.lib.php
M htdocs/lib/company.lib.php
M htdocs/lib/date.lib.php
M htdocs/lib/functions.lib.php
M htdocs/lib/member.lib.php
M htdocs/lib/memory.lib.php
M htdocs/lib/pdf.lib.php
M htdocs/lib/security.lib.php
M htdocs/lib/usergroups.lib.php
M htdocs/main.inc.php
M htdocs/master.inc.php
M htdocs/product/admin/produit.php
M htdocs/product/class/product.class.php
M htdocs/product/composition/fiche.php
M htdocs/product/fiche.php
M htdocs/product/fournisseurs.php
M htdocs/projet/contact.php
M htdocs/projet/tasks/contact.php
M htdocs/societe/canvas/actions_card_common.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/lien.php
M htdocs/societe/rib.php
M htdocs/societe/soc.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/AUTHOR
M htdocs/theme/bureau2crea/graph-color.php
M htdocs/theme/bureau2crea/img/1downarrow.png
M htdocs/theme/bureau2crea/img/1downarrow_selected.png
M htdocs/theme/bureau2crea/img/1leftarrow.png
M htdocs/theme/bureau2crea/img/1leftarrow_selected.png
M htdocs/theme/bureau2crea/img/1rightarrow.png
M htdocs/theme/bureau2crea/img/1rightarrow_selected.png
M htdocs/theme/bureau2crea/img/1uparrow.png
M htdocs/theme/bureau2crea/img/1uparrow_selected.png
M htdocs/theme/bureau2crea/img/bg_btnBlue.jpg
M htdocs/theme/bureau2crea/img/bg_btnGreen.jpg
M htdocs/theme/bureau2crea/img/bg_centerBlock-title.jpg
A htdocs/theme/bureau2crea/img/bg_centerBlock-title2.jpg
A htdocs/theme/bureau2crea/img/bg_connectionBox.jpg
A htdocs/theme/bureau2crea/img/bg_mainNav.jpg
A htdocs/theme/bureau2crea/img/bg_navHorizontal.jpg
A htdocs/theme/bureau2crea/img/dolibarr_logo.png
M htdocs/theme/bureau2crea/img/edit.png
A htdocs/theme/bureau2crea/img/favicon.ico
M htdocs/theme/bureau2crea/img/object_account.png
M htdocs/theme/bureau2crea/img/object_action.png
M htdocs/theme/bureau2crea/img/object_email.png
M htdocs/theme/bureau2crea/img/object_generic.png
M htdocs/theme/bureau2crea/img/object_intervention.png
M htdocs/theme/bureau2crea/img/object_list.png
M htdocs/theme/bureau2crea/img/object_stock.png
M htdocs/theme/bureau2crea/img/object_technic.png
M htdocs/theme/bureau2crea/img/object_trip.png
M htdocs/theme/bureau2crea/img/setup.png
M htdocs/theme/bureau2crea/img/stcomm-1.png
M htdocs/theme/bureau2crea/img/stcomm0.png
M htdocs/theme/bureau2crea/img/stcomm1.png
M htdocs/theme/bureau2crea/img/stcomm2.png
M htdocs/theme/bureau2crea/img/stcomm3.png
M htdocs/theme/bureau2crea/img/switch_off.png
M htdocs/theme/bureau2crea/img/switch_on.png
A htdocs/theme/bureau2crea/init_ihm.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/bureau2crea/thumb.png
A htdocs/theme/bureau2crea/tpl/login.tpl.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/freelug/style.css.php
M htdocs/theme/phones/smartphone/theme/default/default.css.php
M htdocs/theme/yellow/style.css.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/fiche.php
M htdocs/user/group/fiche.php
M htdocs/user/group/index.php
M htdocs/user/group/ldap.php
M htdocs/user/group/perms.php
M htdocs/user/home.php
M htdocs/user/index.php
M htdocs/user/passwordforgotten.php
M htdocs/user/perms.php
M htdocs/webservices/server_thirdparty.php
M scripts/invoices/rebuild_merge_pdf.php
M test/phpunit/phpunittest.xml
Log Message:
-----------
Merge develop
Commit: 73f236563742ab9ad7918d559ec4ea3ecbdce8ac
https://github.com/Dolibarr/dolibarr/commit/73f236563742ab9ad7918d559ec4ea3ecbdce8ac
Author: Herve Prot <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Changed paths:
M htdocs/categories/index.php
M htdocs/societe/index.php
Log Message:
-----------
Modify link to external module
Commit: cdb3a4ca6f0a6ef6670d76b65be37012ec847df1
https://github.com/Dolibarr/dolibarr/commit/cdb3a4ca6f0a6ef6670d76b65be37012ec847df1
Author: Herve Prot <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Changed paths:
M htdocs/categories/index.php
M htdocs/societe/index.php
Log Message:
-----------
Merge branch '3.1-beta' into symeos-dev
Commit: cbf4776d310109308115036ef70f10a34cf9cbad
https://github.com/Dolibarr/dolibarr/commit/cbf4776d310109308115036ef70f10a34cf9cbad
Author: Regis Houssin <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/lib/functions.lib.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/fiche.php
M htdocs/user/group/fiche.php
M htdocs/user/group/index.php
M htdocs/user/home.php
M htdocs/user/index.php
Log Message:
-----------
multicompany enhancement (in progress)
Commit: f9eed97d41443a140c8d2d3f0d91d059c8031e6f
https://github.com/Dolibarr/dolibarr/commit/f9eed97d41443a140c8d2d3f0d91d059c8031e6f
Author: Regis Houssin <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Log Message:
-----------
multicompany enhancement (in progress)
Commit: 78261eee8fa892da996142527137dabb2c7daf38
https://github.com/Dolibarr/dolibarr/commit/78261eee8fa892da996142527137dabb2c7daf38
Author: Regis Houssin <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Log Message:
-----------
multicompany enhancement (in progress)
Commit: 8ef6b59f5616ec4a7ac96067da2e7b7eb0f75322
https://github.com/Dolibarr/dolibarr/commit/8ef6b59f5616ec4a7ac96067da2e7b7eb0f75322
Author: Regis Houssin <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Log Message:
-----------
multicompany enhancement (in progress)
Commit: d4d0656e08b29e5e35cdf631959f1bdd6c1154e7
https://github.com/Dolibarr/dolibarr/commit/d4d0656e08b29e5e35cdf631959f1bdd6c1154e7
Author: Regis Houssin <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Log Message:
-----------
multicompany enhancement (in progress)
Commit: 341fd38184faeb60d8a5aa8573d82c13238d194b
https://github.com/Dolibarr/dolibarr/commit/341fd38184faeb60d8a5aa8573d82c13238d194b
Author: Regis Houssin <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Log Message:
-----------
multicompany enhancement (in progress)
Commit: 18a91e382538ab6e2063590ff218e5ef547befbc
https://github.com/Dolibarr/dolibarr/commit/18a91e382538ab6e2063590ff218e5ef547befbc
Author: Regis Houssin <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Log Message:
-----------
multicompany enhancement (in progress)
Commit: d460250b9729c91166b001a711e61015db18de58
https://github.com/Dolibarr/dolibarr/commit/d460250b9729c91166b001a711e61015db18de58
Author: Regis Houssin <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/lib/functions.lib.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/fiche.php
M htdocs/user/group/fiche.php
M htdocs/user/group/index.php
M htdocs/user/home.php
M htdocs/user/index.php
Log Message:
-----------
multicompany enhancement (in progress)
Commit: 924919336bc5df981d6283361d33a82af68f88ce
https://github.com/Dolibarr/dolibarr/commit/924919336bc5df981d6283361d33a82af68f88ce
Author: Regis Houssin <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Log Message:
-----------
multicompany enhancement (in progress)
Commit: 69dfe98166c4644899ca08c15aa629156ad6c390
https://github.com/Dolibarr/dolibarr/commit/69dfe98166c4644899ca08c15aa629156ad6c390
Author: Regis Houssin <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/lib/functions.lib.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/fiche.php
M htdocs/user/group/fiche.php
M htdocs/user/group/index.php
M htdocs/user/home.php
M htdocs/user/index.php
Log Message:
-----------
cvsimport
Commit: a5211cd22332a749d5021896a5314e96cb172605
https://github.com/Dolibarr/dolibarr/commit/a5211cd22332a749d5021896a5314e96cb172605
Author: Regis Houssin <address@hidden>
Date: 2011-08-19 (Fri, 19 Aug 2011)
Log Message:
-----------
cvsimport
Commit: 873a62e26ceea6f5f38d0977cc2c31d65e7a3fea
https://github.com/Dolibarr/dolibarr/commit/873a62e26ceea6f5f38d0977cc2c31d65e7a3fea
Author: Herve Prot <address@hidden>
Date: 2011-08-20 (Sat, 20 Aug 2011)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/tpl/login.tpl.php
M htdocs/lib/functions.lib.php
M htdocs/main.inc.php
M htdocs/theme/bureau2crea/img/favicon.ico
M htdocs/theme/bureau2crea/init_ihm.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/bureau2crea/tpl/login.tpl.php
A htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
A htdocs/theme/cameleo/img/favicon.ico
A htdocs/theme/eldy/img/favicon.ico
A htdocs/theme/freelug/img/favicon.ico
A htdocs/theme/phones/smartphone/theme/default/img/favicon.ico
A htdocs/theme/yellow/img/favicon.ico
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/fiche.php
M htdocs/user/group/fiche.php
M htdocs/user/group/index.php
M htdocs/user/home.php
M htdocs/user/index.php
M htdocs/user/passwordforgotten.php
Log Message:
-----------
Merge origin/develop
Commit: b39af49c77e6940919906553f6e2735e5bd42454
https://github.com/Dolibarr/dolibarr/commit/b39af49c77e6940919906553f6e2735e5bd42454
Author: Herve Prot <address@hidden>
Date: 2011-08-20 (Sat, 20 Aug 2011)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/tpl/login.tpl.php
M htdocs/lib/functions.lib.php
M htdocs/main.inc.php
M htdocs/theme/bureau2crea/img/favicon.ico
M htdocs/theme/bureau2crea/init_ihm.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/bureau2crea/tpl/login.tpl.php
A htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
A htdocs/theme/cameleo/img/favicon.ico
A htdocs/theme/eldy/img/favicon.ico
A htdocs/theme/freelug/img/favicon.ico
A htdocs/theme/phones/smartphone/theme/default/img/favicon.ico
A htdocs/theme/yellow/img/favicon.ico
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/fiche.php
M htdocs/user/group/fiche.php
M htdocs/user/group/index.php
M htdocs/user/home.php
M htdocs/user/index.php
M htdocs/user/passwordforgotten.php
Log Message:
-----------
Merge branch 'develop' into symeos-dev
Compare: https://github.com/Dolibarr/dolibarr/compare/355899c...b39af49
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 6c62bf: Merge develop,
Herve Prot <=