[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 9c8a9f: Print IPP
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 9c8a9f: Print IPP |
|
Date: |
Wed, 12 Jun 2013 01:57:17 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 9c8a9ff7dc97cd9b6bc2bf2f20ec89b4f0377ba4
https://github.com/Dolibarr/dolibarr/commit/9c8a9ff7dc97cd9b6bc2bf2f20ec89b4f0377ba4
Author: frederic34 <address@hidden>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M htdocs/compta/facture.php
M htdocs/core/class/dolprintipp.class.php
Log Message:
-----------
Print IPP
Commit: 33e6654454f20d118e96918873a8a49e8be4a684
https://github.com/Dolibarr/dolibarr/commit/33e6654454f20d118e96918873a8a49e8be4a684
Author: frederic34 <address@hidden>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M htdocs/core/class/dolprintipp.class.php
M htdocs/printipp/admin/printipp.php
Log Message:
-----------
print ipp
Commit: 4c29eaecd1b9bebe07f145d268a9cc37ef6c66e0
https://github.com/Dolibarr/dolibarr/commit/4c29eaecd1b9bebe07f145d268a9cc37ef6c66e0
Author: frederic34 <address@hidden>
Date: 2013-03-26 (Tue, 26 Mar 2013)
Changed paths:
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
M htdocs/core/modules/modPrintIPP.class.php
M htdocs/printipp/admin/printipp.php
Log Message:
-----------
Print IPP
Commit: 1cd39df82b41759d0983e06329f9cba733eec5a5
https://github.com/Dolibarr/dolibarr/commit/1cd39df82b41759d0983e06329f9cba733eec5a5
Author: frederic34 <address@hidden>
Date: 2013-03-26 (Tue, 26 Mar 2013)
Changed paths:
M COPYRIGHT
M ChangeLog
M README
M README-FR
M README.md
A dev/initdata/mysqldump_dolibarr_3.4.0.sql
A dev/ldap/setup_example_activedirectory.jpg
M dev/skeletons/skeleton_page.php
M dev/skeletons/skeleton_script.php
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/cartes/carte.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/fiche.php
M htdocs/adherents/index.php
M htdocs/adherents/liste.php
M htdocs/admin/agenda.php
M htdocs/admin/agenda_extrafields.php
M htdocs/admin/agenda_extsites.php
M htdocs/admin/agenda_xcal.php
A htdocs/admin/bank.php
M htdocs/admin/carrier.php
M htdocs/admin/commande.php
M htdocs/admin/company.php
M htdocs/admin/compta.php
M htdocs/admin/contract.php
M htdocs/admin/dict.php
M htdocs/admin/dons.php
M htdocs/admin/ecm.php
M htdocs/admin/expedition.php
M htdocs/admin/fckeditor.php
M htdocs/admin/fichinter.php
R htdocs/admin/fournisseur.php
M htdocs/admin/ldap_members.php
M htdocs/admin/livraison.php
M htdocs/admin/mailing.php
M htdocs/admin/mails.php
M htdocs/admin/menus.php
M htdocs/admin/menus/index.php
M htdocs/admin/menus/other.php
M htdocs/admin/modules.php
M htdocs/admin/pdf.php
M htdocs/admin/prelevement.php
M htdocs/admin/project.php
M htdocs/admin/security.php
M htdocs/admin/security_other.php
M htdocs/admin/stock.php
A htdocs/admin/supplier_invoice.php
A htdocs/admin/supplier_order.php
M htdocs/admin/system/about.php
M htdocs/admin/system/dolibarr.php
M htdocs/admin/taxes.php
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/listevents.php
M htdocs/cashdesk/index_verif.php
M htdocs/categories/index.php
M htdocs/comm/action/fiche.php
M htdocs/comm/index.php
M htdocs/comm/mailing/fiche.php
M htdocs/comm/mailing/index.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/index.php
M htdocs/comm/prospect/index.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
M htdocs/commande/index.php
M htdocs/commande/liste.php
R htdocs/commissions/admin/commissions.php
R htdocs/commissions/index.php
R htdocs/commissions/lib/commissions.lib.php
R htdocs/compta/bank/admin/bank.php
M htdocs/compta/bank/rappro.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/impayees.php
M htdocs/compta/index.php
M htdocs/compta/paiement/cheque/index.php
M htdocs/compta/prelevement/index.php
M htdocs/compta/recap-compta.php
M htdocs/compta/resultat/index.php
M htdocs/compta/ventilation/fournisseur/index.php
M htdocs/compta/ventilation/index.php
M htdocs/compta/ventilation/lignes.php
M htdocs/compta/ventilation/liste.php
M htdocs/contact/fiche.php
M htdocs/contact/list.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/fiche.php
M htdocs/contrat/index.php
M htdocs/core/ajax/ajaxdirpreview.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
A htdocs/core/class/html.formcron.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/js/lib_head.js
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/company.lib.php
A htdocs/core/lib/cron.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/invoice.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/price.lib.php
M htdocs/core/lib/propal.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/lib/sendings.lib.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/menus/standard/eldy_menu.php
M htdocs/core/menus/standard/empty.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
M htdocs/core/modules/expedition/modules_expedition.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/modAdherent.class.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/modules/modBanque.class.php
R htdocs/core/modules/modCommissions.class.php
A htdocs/core/modules/modCron.class.php
M htdocs/core/modules/modExpedition.class.php
M htdocs/core/modules/modFckeditor.class.php
M htdocs/core/modules/modFournisseur.class.php
M htdocs/core/modules/modProjet.class.php
A htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
A htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
A htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.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/tpl/admin_extrafields_add.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
A htdocs/cron/admin/cron.php
A htdocs/cron/card.php
A htdocs/cron/class/cronjob.class.php
R htdocs/cron/functions_cron.lib.php
R htdocs/cron/index.php
A htdocs/cron/info.php
A htdocs/cron/list.php
M htdocs/ecm/index.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/fiche.php
M htdocs/expedition/index.php
M htdocs/exports/class/export.class.php
M htdocs/exports/export.php
M htdocs/externalsite/admin/externalsite.php
M htdocs/fichinter/fiche.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/contact.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/commande/document.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/commande/history.php
M htdocs/fourn/commande/index.php
M htdocs/fourn/commande/liste.php
M htdocs/fourn/commande/note.php
M htdocs/fourn/facture/fiche.php
M htdocs/fourn/index.php
M htdocs/includes/jquery/plugins/datatables/css/jquery.dataTables.css
M htdocs/includes/jquery/plugins/datatables/css/jquery.dataTables_jui.css
M
htdocs/includes/jquery/plugins/datatables/extras/ColReorder/js/ColReorder.js
M
htdocs/includes/jquery/plugins/datatables/extras/ColReorder/js/ColReorder.min.js
M htdocs/includes/jquery/plugins/datatables/extras/ColVis/js/ColVis.js
M htdocs/includes/jquery/plugins/datatables/extras/ColVis/js/ColVis.min.js
M
htdocs/includes/jquery/plugins/datatables/extras/TableTools/css/TableTools.css
M
htdocs/includes/jquery/plugins/datatables/extras/TableTools/css/TableTools_JUI.css
M
htdocs/includes/jquery/plugins/datatables/extras/TableTools/js/TableTools.js
M
htdocs/includes/jquery/plugins/datatables/extras/TableTools/js/TableTools.min.js
M
htdocs/includes/jquery/plugins/datatables/extras/TableTools/js/ZeroClipboard.js
M
htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf/copy_csv_xls.swf
M
htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf/copy_csv_xls_pdf.swf
M htdocs/includes/jquery/plugins/datatables/js/jquery.dataTables.js
M htdocs/includes/jquery/plugins/datatables/js/jquery.dataTables.min.js
R htdocs/includes/phpmailer/LICENSE
R htdocs/includes/phpmailer/README
R htdocs/includes/phpmailer/changelog.txt
R htdocs/includes/phpmailer/class.phpmailer.php
R htdocs/includes/phpmailer/class.pop3.php
R htdocs/includes/phpmailer/class.smtp.php
M htdocs/index.php
M htdocs/install/check.php
A htdocs/install/doctemplates/project/template_project.odt
A htdocs/install/doctemplates/project/template_task_summary.odt
M htdocs/install/mysql/data/llx_00_c_pays.sql
M htdocs/install/mysql/data/llx_c_revenuestamp.sql
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/tables/llx_adherent.sql
M htdocs/install/mysql/tables/llx_c_tva.sql
A htdocs/install/mysql/tables/llx_cronjob.sql
M htdocs/install/mysql/tables/llx_facture_fourn_det.sql
M htdocs/install/mysql/tables/llx_facturedet.sql
M htdocs/install/mysql/tables/llx_paiement.sql
M htdocs/install/mysql/tables/llx_societe.sql
M htdocs/install/mysql/tables/llx_user.sql
M htdocs/install/pgsql/functions/functions.sql
M htdocs/install/upgrade.php
M htdocs/langs/ar_SA/admin.lang
M htdocs/langs/ar_SA/bills.lang
M htdocs/langs/ar_SA/install.lang
M htdocs/langs/ar_SA/main.lang
M htdocs/langs/ar_SA/members.lang
M htdocs/langs/ar_SA/other.lang
M htdocs/langs/bg_BG/admin.lang
M htdocs/langs/bg_BG/bills.lang
M htdocs/langs/bg_BG/install.lang
M htdocs/langs/bg_BG/members.lang
M htdocs/langs/bg_BG/other.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/bills.lang
R htdocs/langs/ca_ES/commissions.lang
M htdocs/langs/ca_ES/companies.lang
M htdocs/langs/ca_ES/compta.lang
A htdocs/langs/ca_ES/cron.lang
M htdocs/langs/ca_ES/install.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/ca_ES/orders.lang
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/ca_ES/sendings.lang
M htdocs/langs/da_DK/admin.lang
M htdocs/langs/da_DK/bills.lang
M htdocs/langs/da_DK/install.lang
M htdocs/langs/da_DK/members.lang
M htdocs/langs/da_DK/other.lang
M htdocs/langs/de_AT/admin.lang
M htdocs/langs/de_AT/install.lang
M htdocs/langs/de_AT/other.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/install.lang
M htdocs/langs/de_DE/other.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/el_GR/bills.lang
M htdocs/langs/el_GR/install.lang
M htdocs/langs/el_GR/members.lang
M htdocs/langs/el_GR/other.lang
M htdocs/langs/en_IN/other.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/bills.lang
R htdocs/langs/en_US/commissions.lang
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/compta.lang
A htdocs/langs/en_US/cron.lang
M htdocs/langs/en_US/ecm.lang
M htdocs/langs/en_US/install.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/members.lang
M htdocs/langs/en_US/orders.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/sendings.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
R htdocs/langs/es_ES/commissions.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/compta.lang
A htdocs/langs/es_ES/cron.lang
M htdocs/langs/es_ES/ecm.lang
M htdocs/langs/es_ES/install.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/orders.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/es_ES/sendings.lang
M htdocs/langs/et_EE/admin.lang
M htdocs/langs/et_EE/bills.lang
M htdocs/langs/et_EE/install.lang
M htdocs/langs/et_EE/members.lang
M htdocs/langs/et_EE/other.lang
M htdocs/langs/fa_IR/admin.lang
M htdocs/langs/fa_IR/install.lang
M htdocs/langs/fa_IR/members.lang
M htdocs/langs/fa_IR/other.lang
M htdocs/langs/fi_FI/admin.lang
M htdocs/langs/fi_FI/bills.lang
M htdocs/langs/fi_FI/install.lang
M htdocs/langs/fi_FI/members.lang
M htdocs/langs/fi_FI/other.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/bills.lang
R htdocs/langs/fr_FR/commissions.lang
M htdocs/langs/fr_FR/companies.lang
M htdocs/langs/fr_FR/compta.lang
A htdocs/langs/fr_FR/cron.lang
M htdocs/langs/fr_FR/ecm.lang
M htdocs/langs/fr_FR/install.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/orders.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/langs/fr_FR/sendings.lang
M htdocs/langs/he_IL/admin.lang
M htdocs/langs/he_IL/bills.lang
M htdocs/langs/he_IL/install.lang
M htdocs/langs/he_IL/members.lang
M htdocs/langs/he_IL/other.lang
M htdocs/langs/hu_HU/admin.lang
M htdocs/langs/hu_HU/bills.lang
M htdocs/langs/hu_HU/install.lang
M htdocs/langs/hu_HU/members.lang
M htdocs/langs/hu_HU/other.lang
M htdocs/langs/is_IS/admin.lang
M htdocs/langs/is_IS/bills.lang
M htdocs/langs/is_IS/install.lang
M htdocs/langs/is_IS/members.lang
M htdocs/langs/is_IS/other.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/it_IT/install.lang
M htdocs/langs/it_IT/members.lang
M htdocs/langs/it_IT/other.lang
M htdocs/langs/ja_JP/admin.lang
M htdocs/langs/ja_JP/bills.lang
M htdocs/langs/ja_JP/install.lang
M htdocs/langs/ja_JP/members.lang
M htdocs/langs/ja_JP/other.lang
M htdocs/langs/nb_NO/admin.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nb_NO/install.lang
M htdocs/langs/nb_NO/members.lang
M htdocs/langs/nb_NO/other.lang
M htdocs/langs/nl_BE/admin.lang
M htdocs/langs/nl_BE/install.lang
M htdocs/langs/nl_BE/other.lang
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/bills.lang
M htdocs/langs/nl_NL/install.lang
M htdocs/langs/nl_NL/other.lang
M htdocs/langs/pl_PL/admin.lang
M htdocs/langs/pl_PL/bills.lang
M htdocs/langs/pl_PL/install.lang
M htdocs/langs/pl_PL/members.lang
M htdocs/langs/pl_PL/other.lang
M htdocs/langs/pt_BR/admin.lang
M htdocs/langs/pt_BR/install.lang
M htdocs/langs/pt_BR/other.lang
M htdocs/langs/pt_PT/admin.lang
M htdocs/langs/pt_PT/install.lang
M htdocs/langs/pt_PT/members.lang
M htdocs/langs/pt_PT/other.lang
M htdocs/langs/ro_RO/admin.lang
M htdocs/langs/ro_RO/bills.lang
M htdocs/langs/ro_RO/install.lang
M htdocs/langs/ro_RO/members.lang
M htdocs/langs/ro_RO/other.lang
M htdocs/langs/ru_RU/admin.lang
M htdocs/langs/ru_RU/install.lang
M htdocs/langs/ru_RU/other.lang
M htdocs/langs/ru_UA/install.lang
M htdocs/langs/ru_UA/other.lang
M htdocs/langs/sl_SI/admin.lang
M htdocs/langs/sl_SI/install.lang
M htdocs/langs/sl_SI/other.lang
M htdocs/langs/sv_SE/admin.lang
M htdocs/langs/sv_SE/bills.lang
M htdocs/langs/sv_SE/install.lang
M htdocs/langs/sv_SE/members.lang
M htdocs/langs/sv_SE/other.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/install.lang
M htdocs/langs/tr_TR/other.lang
M htdocs/langs/zh_CN/admin.lang
M htdocs/langs/zh_CN/bills.lang
M htdocs/langs/zh_CN/install.lang
M htdocs/langs/zh_CN/members.lang
M htdocs/langs/zh_CN/other.lang
M htdocs/langs/zh_TW/admin.lang
M htdocs/langs/zh_TW/bills.lang
M htdocs/langs/zh_TW/install.lang
M htdocs/langs/zh_TW/members.lang
M htdocs/langs/zh_TW/other.lang
M htdocs/livraison/class/livraison.class.php
M htdocs/main.inc.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/product/index.php
M htdocs/product/liste.php
M htdocs/product/stock/index.php
M htdocs/product/stock/product.php
M htdocs/projet/class/project.class.php
A htdocs/public/cron/cron_run_jobs.php
M htdocs/public/members/new.php
M htdocs/public/members/public_card.php
M htdocs/public/members/public_list.php
M htdocs/societe/class/societe.class.php
A htdocs/societe/consumption.php
M htdocs/societe/index.php
M htdocs/societe/soc.php
M htdocs/societe/societe.php
A htdocs/theme/amarok/img/cron.png
A htdocs/theme/amarok/img/object_cron.png
A htdocs/theme/amarok/img/object_invoice.png
M htdocs/theme/amarok/style.css.php
A htdocs/theme/auguria/img/cron.png
R htdocs/theme/auguria/img/object_commissions.png
A htdocs/theme/auguria/img/object_cron.png
A htdocs/theme/bureau2crea/img/cron.png
R htdocs/theme/bureau2crea/img/object_commissions.png
A htdocs/theme/bureau2crea/img/object_cron.png
A htdocs/theme/cameleo/img/cron.png
R htdocs/theme/cameleo/img/object_commissions.png
A htdocs/theme/cameleo/img/object_cron.png
M htdocs/theme/eldy/ckeditor/config.js
A htdocs/theme/eldy/img/menus/cron.png
R htdocs/theme/eldy/img/object_commissions.png
A htdocs/theme/eldy/img/object_cron.png
M htdocs/user/class/user.class.php
M htdocs/user/fiche.php
M htdocs/user/home.php
M htdocs/webservices/server_invoice.php
M htdocs/webservices/server_order.php
M htdocs/webservices/server_productorservice.php
M htdocs/webservices/server_user.php
A scripts/cron/cron_run_jobs.php
M scripts/emailings/mailing-send.php
M scripts/invoices/email_unpaid_invoices_to_representatives.php
M scripts/members/sync_members_ldap2dolibarr.php
M test/phpunit/AdherentTest.php
M test/soapui/Dolibarr-soapui-project.xml
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: 40f11206de8d766173aec75557e8484cc2c921e4
https://github.com/Dolibarr/dolibarr/commit/40f11206de8d766173aec75557e8484cc2c921e4
Author: frederic34 <address@hidden>
Date: 2013-04-08 (Mon, 08 Apr 2013)
Changed paths:
M ChangeLog
M build/debian/rules
R dev/finddosfiles.sh
R dev/findutf8bom.sh
A dev/fixdosfiles.sh
A dev/fixutf8bomfiles.sh
R dev/removeutf8bom.sh
A dev/resize_window.sh
M dev/skeletons/modMyModule.class.php
M dev/skeletons/skeleton_script.php
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/admin/adherent_extrafields.php
M htdocs/adherents/admin/adherent_type_extrafields.php
M htdocs/adherents/admin/public.php
M htdocs/adherents/agenda.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/fiche.php
M htdocs/adherents/fiche_subscription.php
M htdocs/adherents/index.php
M htdocs/adherents/ldap.php
M htdocs/adherents/note.php
M htdocs/adherents/stats/index.php
M htdocs/adherents/type.php
M htdocs/admin/agenda.php
M htdocs/admin/agenda_extrafields.php
M htdocs/admin/agenda_extsites.php
M htdocs/admin/agenda_xcal.php
M htdocs/admin/carrier.php
M htdocs/admin/clicktodial.php
M htdocs/admin/commande.php
M htdocs/admin/company.php
M htdocs/admin/const.php
M htdocs/admin/dict.php
M htdocs/admin/menus.php
M htdocs/admin/menus/index.php
M htdocs/admin/modules.php
A htdocs/admin/order_extrafields.php
M htdocs/admin/pdf.php
M htdocs/admin/propal.php
M htdocs/admin/sms.php
M htdocs/admin/supplier_invoice.php
M htdocs/admin/system/dolibarr.php
M htdocs/admin/tools/listevents.php
M htdocs/categories/index.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/fiche.php
M htdocs/comm/action/rapport/index.php
M htdocs/comm/address.php
M htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/fiche.php
M htdocs/comm/index.php
M htdocs/comm/mailing/fiche.php
M htdocs/comm/mailing/index.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/index.php
M htdocs/comm/propal/stats/index.php
M htdocs/comm/prospect/index.php
M htdocs/comm/prospect/list.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
M htdocs/commande/index.php
M htdocs/commande/stats/index.php
M htdocs/compta/bank/rappro.php
M htdocs/compta/bank/treso.php
M htdocs/compta/deplacement/stats/index.php
M htdocs/compta/dons/fiche.php
M htdocs/compta/facture.php
M htdocs/compta/facture/admin/facture_cust_extrafields.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/impayees.php
M htdocs/compta/facture/stats/index.php
M htdocs/compta/index.php
M htdocs/compta/journal/purchasesjournal.php
M htdocs/compta/journal/sellsjournal.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/cheque/index.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/paiement/liste.php
M htdocs/compta/prelevement/index.php
M htdocs/compta/recap-compta.php
M htdocs/compta/ventilation/index.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/fiche.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/fiche.php
M htdocs/contrat/index.php
M htdocs/core/admin_extrafields.inc.php
M htdocs/core/boxes/box_actions.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/boxes/box_comptes.php
M htdocs/core/boxes/box_factures_fourn.php
M htdocs/core/boxes/box_factures_fourn_imp.php
M htdocs/core/boxes/box_members.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/dolgraph.class.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/fileupload.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/menubase.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/db/mysql.class.php
M htdocs/core/db/mysqli.class.php
A htdocs/core/get_menudiv.php
R htdocs/core/getmenu_jmobile.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/json.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/security2.lib.php
M htdocs/core/lib/treeview.lib.php
M htdocs/core/login/README.txt
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/auguria_menu.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/menus/standard/eldy_menu.php
M htdocs/core/menus/standard/empty.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/export/export_csv.modules.php
M htdocs/core/modules/export/export_excel.modules.php
M htdocs/core/modules/export/export_excel2007.modules.php
M htdocs/core/modules/export/export_tsv.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/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/example.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/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/modCron.class.php
M htdocs/core/modules/modPrintIPP.class.php
M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
R htdocs/core/search_jmobile.php
A htdocs/core/search_page.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/core/tpl/admin_extrafields_edit.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/objectline_add.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/cron/admin/cron.php
M htdocs/cron/card.php
M htdocs/cron/class/cronjob.class.php
M htdocs/cron/list.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/fiche.php
M htdocs/expedition/index.php
M htdocs/expedition/stats/month.php
M htdocs/exports/class/export.class.php
M htdocs/exports/export.php
M htdocs/exports/index.php
M htdocs/fichinter/fiche.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/facture/fiche.php
M htdocs/fourn/facture/impayees.php
M htdocs/fourn/facture/index.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/fiche.php
M htdocs/fourn/index.php
M htdocs/fourn/paiement/fiche.php
M htdocs/fourn/recap-fourn.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/index.php
M htdocs/imports/index.php
M htdocs/includes/odtphp/Segment.php
M htdocs/includes/odtphp/odf.php
A htdocs/includes/odtphp/odt2pdf.sh
M htdocs/index.php
R htdocs/install/doctemplates/project/template_project.odt
R htdocs/install/doctemplates/project/template_task_summary.odt
A htdocs/install/doctemplates/projects/template_project.odt
A htdocs/install/doctemplates/projects/template_task_summary.odt
M htdocs/install/etape1.php
M htdocs/install/etape5.php
M htdocs/install/inc.php
M htdocs/install/mysql/data/llx_00_c_pays.sql
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/tables/llx_actioncomm.sql
A htdocs/install/mysql/tables/llx_commande_extrafields.key.sql
A htdocs/install/mysql/tables/llx_commande_extrafields.sql
M htdocs/install/mysql/tables/llx_extrafields.sql
M htdocs/install/mysql/tables/llx_facture_fourn.key.sql
M htdocs/install/mysql/tables/llx_facture_fourn.sql
M htdocs/install/mysql/tables/llx_facture_fourn_det.sql
A htdocs/install/mysql/tables/llx_printer_ipp.sql
M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
M htdocs/install/mysql/tables/llx_product_price.sql
M htdocs/install/mysql/tables/llx_societe.sql
M htdocs/install/mysql/tables/llx_socpeople.sql
M htdocs/install/mysql/tables/llx_user.sql
M htdocs/install/mysql/tables/llx_user_clicktodial.sql
M htdocs/install/pgsql/functions/functions.sql
M htdocs/install/upgrade.php
M htdocs/langs/bg_BG/errors.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/errors.lang
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/cron.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/mailmanspip.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/members.lang
M htdocs/langs/en_US/orders.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/propal.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/other.lang
A htdocs/langs/es_MX/banks.lang
M htdocs/langs/es_MX/bills.lang
A htdocs/langs/es_MX/categories.lang
M htdocs/langs/es_MX/companies.lang
A htdocs/langs/es_MX/main.lang
A htdocs/langs/es_PE/admin.lang
A htdocs/langs/es_PE/bills.lang
A htdocs/langs/es_PE/companies.lang
A htdocs/langs/es_PE/compta.lang
A htdocs/langs/es_PE/main.lang
A htdocs/langs/es_PE/propal.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/langs/fr_FR/mailmanspip.lang
M htdocs/langs/fr_FR/members.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/langs/fr_FR/propal.lang
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/categories.lang
M htdocs/langs/nl_NL/companies.lang
M htdocs/langs/nl_NL/propal.lang
M htdocs/langs/pt_PT/admin.lang
M htdocs/langs/zh_CN/main.lang
M htdocs/langs/zh_TW/main.lang
M htdocs/mailmanspip/class/mailmanspip.class.php
M htdocs/main.inc.php
M htdocs/master.inc.php
M htdocs/product/admin/product_tools.php
M htdocs/product/class/product.class.php
M htdocs/product/fiche.php
M htdocs/product/fournisseurs.php
M htdocs/product/index.php
M htdocs/product/stock/index.php
M htdocs/public/paybox/paymentko.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
M htdocs/societe/admin/contact_extrafields.php
M htdocs/societe/admin/societe_extrafields.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/consumption.php
M htdocs/societe/index.php
M htdocs/societe/soc.php
M htdocs/support/index.php
A htdocs/theme/amarok/img/object_action_rdv.png
A htdocs/theme/amarok/img/play.png
M htdocs/theme/amarok/style.css.php
A htdocs/theme/auguria/img/play.png
M htdocs/theme/auguria/style.css.php
A htdocs/theme/bureau2crea/img/play.png
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/bureau2crea/tpl/login.tpl.php
A htdocs/theme/cameleo/img/play.png
M htdocs/theme/cameleo/style.css.php
A htdocs/theme/eldy/img/play.png
M htdocs/theme/eldy/style.css.php
R htdocs/theme/phones/index.php
R htdocs/theme/phones/smartphone/AUTHOR
R htdocs/theme/phones/smartphone/index.php
R htdocs/theme/phones/smartphone/theme/default/default.css.php
R htdocs/theme/phones/smartphone/theme/default/img/accessibility.png
R htdocs/theme/phones/smartphone/theme/default/img/appstore.png
R htdocs/theme/phones/smartphone/theme/default/img/basics.png
R htdocs/theme/phones/smartphone/theme/default/img/calculator.png
R htdocs/theme/phones/smartphone/theme/default/img/calendar.png
R htdocs/theme/phones/smartphone/theme/default/img/calendar2.png
R htdocs/theme/phones/smartphone/theme/default/img/camera.png
R htdocs/theme/phones/smartphone/theme/default/img/clock.png
R htdocs/theme/phones/smartphone/theme/default/img/close.png
R htdocs/theme/phones/smartphone/theme/default/img/compass.png
R htdocs/theme/phones/smartphone/theme/default/img/contacts.png
R htdocs/theme/phones/smartphone/theme/default/img/dolibarr.png
R htdocs/theme/phones/smartphone/theme/default/img/favicon.ico
R htdocs/theme/phones/smartphone/theme/default/img/help.png
R htdocs/theme/phones/smartphone/theme/default/img/homescreen.png
R htdocs/theme/phones/smartphone/theme/default/img/ipod.png
R htdocs/theme/phones/smartphone/theme/default/img/itunes.png
R htdocs/theme/phones/smartphone/theme/default/img/mail.png
R htdocs/theme/phones/smartphone/theme/default/img/maps.png
R htdocs/theme/phones/smartphone/theme/default/img/messages.png
R htdocs/theme/phones/smartphone/theme/default/img/music.png
R htdocs/theme/phones/smartphone/theme/default/img/nike+.png
R htdocs/theme/phones/smartphone/theme/default/img/notepad.png
R htdocs/theme/phones/smartphone/theme/default/img/other.png
R htdocs/theme/phones/smartphone/theme/default/img/otherapps.png
R htdocs/theme/phones/smartphone/theme/default/img/photos.png
R htdocs/theme/phones/smartphone/theme/default/img/plugin.png
R htdocs/theme/phones/smartphone/theme/default/img/safari.png
R htdocs/theme/phones/smartphone/theme/default/img/settings.png
R htdocs/theme/phones/smartphone/theme/default/img/sketches.png
R htdocs/theme/phones/smartphone/theme/default/img/sms.png
R htdocs/theme/phones/smartphone/theme/default/img/start.png
R htdocs/theme/phones/smartphone/theme/default/img/stocks.png
R htdocs/theme/phones/smartphone/theme/default/img/support.png
R htdocs/theme/phones/smartphone/theme/default/img/telephone.png
R htdocs/theme/phones/smartphone/theme/default/img/tools.png
R htdocs/theme/phones/smartphone/theme/default/img/video.png
R htdocs/theme/phones/smartphone/theme/default/img/voice.png
R htdocs/theme/phones/smartphone/theme/default/img/weather.png
R htdocs/theme/phones/smartphone/theme/default/img/wordpress.png
R htdocs/theme/phones/smartphone/theme/default/img/youtube.png
R htdocs/theme/phones/smartphone/theme/default/index.php
R htdocs/theme/phones/smartphone/tpl/header.tpl.php
R htdocs/theme/phones/smartphone/tpl/index.php
R htdocs/theme/phones/smartphone/tpl/login.tpl.php
R htdocs/theme/phones/smartphone/tpl/menu.tpl.php
R htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php
M htdocs/user/admin/user_extrafields.php
M htdocs/user/class/user.class.php
M htdocs/user/clicktodial.php
M htdocs/user/fiche.php
M htdocs/user/hierarchy.php
M htdocs/user/home.php
M htdocs/user/logout.php
M htdocs/user/passwordforgotten.php
M htdocs/webservices/server_invoice.php
M htdocs/webservices/server_order.php
M htdocs/webservices/server_productorservice.php
M htdocs/webservices/server_supplier_invoice.php
A scripts/clicktodial/linphone.sh
M scripts/cron/cron_run_jobs.php
M scripts/invoices/email_unpaid_invoices_to_representatives.php
M test/phpunit/AllTests.php
M test/phpunit/ContactTest.php
M test/phpunit/CoreTest.php
M test/phpunit/FunctionsTest.php
M test/phpunit/SocieteTest.php
M test/phpunit/UserTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/WebservicesOrdersTest.php
M test/phpunit/WebservicesOtherTest.php
M test/phpunit/WebservicesThirdpartyTest.php
M test/phpunit/WebservicesUserTest.php
M test/soapui/Dolibarr-soapui-project.xml
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
htdocs/commande/fiche.php
Commit: 9099fe94618193987716df34af1b66f103dd59ee
https://github.com/Dolibarr/dolibarr/commit/9099fe94618193987716df34af1b66f103dd59ee
Author: frederic34 <address@hidden>
Date: 2013-04-08 (Mon, 08 Apr 2013)
Changed paths:
M htdocs/paypal/lib/paypal.lib.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: 61b4305949cbd3fc0e18747f2945759e770327eb
https://github.com/Dolibarr/dolibarr/commit/61b4305949cbd3fc0e18747f2945759e770327eb
Author: frederic34 <address@hidden>
Date: 2013-04-09 (Tue, 09 Apr 2013)
Changed paths:
M htdocs/adherents/admin/adherent_extrafields.php
M htdocs/adherents/admin/adherent_type_extrafields.php
M htdocs/admin/agenda_extrafields.php
M htdocs/admin/commande.php
M htdocs/admin/company.php
M htdocs/admin/order_extrafields.php
M htdocs/admin/project.php
M htdocs/admin/supplier_invoice.php
M htdocs/admin/supplier_order.php
A htdocs/admin/supplierorder_extrafields.php
M htdocs/commande/class/commande.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/fourn.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/modules/modProjet.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/societe/canvas/company/tpl/card_view.tpl.php
M htdocs/societe/class/societe.class.php
R htdocs/societe/lien.php
M htdocs/societe/soc.php
R htdocs/theme/bureau2crea/tpl/login.tpl.php
R htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
M htdocs/theme/eldy/style.css.php
M scripts/members/sync_members_ldap2dolibarr.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: 0c9bc2ac5fcf05ff1dce09a91082f3ad3a4989d7
https://github.com/Dolibarr/dolibarr/commit/0c9bc2ac5fcf05ff1dce09a91082f3ad3a4989d7
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/modules/modPrintIPP.class.php
M htdocs/printipp/admin/printipp.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/frederic34/dolibarr into
frederic34-develop
Conflicts:
htdocs/commande/fiche.php
htdocs/compta/facture.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/34965ee541d7...0c9bc2ac5fcf